From: Dan Nicolaescu Date: Wed, 15 Apr 2009 00:32:47 +0000 (+0000) Subject: (vc-svn-after-dir-status): Fix regexp to allow for X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~840 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6c07ea896f1b97aafdaf08e56d6c6d8f07406ac6;p=emacs.git (vc-svn-after-dir-status): Fix regexp to allow for file names with leading spaces. Ignore "." if it appears as a filename. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2d469b9a462..72550a2e764 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-04-15 Dan Nicolaescu + + * vc-svn.el (vc-svn-after-dir-status): Fix regexp to allow for + file names with leading spaces. Ignore "." if it appears as a + filename. + 2009-04-14 Juanma Barranquero * help-at-pt.el (help-at-pt-kbd-string): Reflow docstring. diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index a2e455a8702..6eeb8985bfd 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -164,7 +164,7 @@ want to force an empty list of arguments, use t." (?? . unregistered) ;; This is what vc-svn-parse-status does. (?~ . edited))) - (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)? +\\(.*\\)$" + (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" ;; Subexp 2 is a dummy in this case, so the numbers match. "^\\(.\\)....\\(.\\) \\(.*\\)$")) result) @@ -176,7 +176,7 @@ want to force an empty list of arguments, use t." ;; FIXME are there other possible combinations? (cond ((eq state 'edited) (setq state 'needs-merge)) ((not state) (setq state 'needs-update)))) - (when state + (when (and state (not (string= "." filename))) (setq result (cons (list filename state) result))))) (funcall callback result)))